From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Tue, 14 Sep 2010 22:46:24 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~6605^2~1
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c96f6e05bc5d23fcbe04e9b7f07fc6d9a5178dfe;p=emacs.git

Merge from mainline.
---

c96f6e05bc5d23fcbe04e9b7f07fc6d9a5178dfe